Reshuffle the css tests a bit

diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in
index 13bba4d6c9201f655400f1a01c23f77ba3e660da..3823e9e6bf70967c8e5c1f9096499352f72774ca 100644 (file)
--- a/testsuite/css/api.test.in
+++ b/testsuite/css/api.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk+/css/api
+Exec=@libexecdir@/installed-tests/gtk-4.0/css/api
 Type=session

diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index e3f6fb385a95b88db5eec80531bb3d15fa08d763..5df0da85cd38803c078fe91d1b8f5abb7719a15e 100644 (file)
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -2,13 +2,9 @@ subdir('parser')
 subdir('nodes')
 subdir('style')
 
-gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
-testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4')
-testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css')
-
 test_api = executable('api', 'api.c',
                       install: get_option('install-tests'),
-                      install_dir: testexecdir,
+                      install_dir: join_paths(installed_test_bindir, 'css'),
                       dependencies: libgtk_dep)
 test('css/api', test_api)
 
@@ -18,6 +14,6 @@ if get_option('install-tests')
   configure_file(input: 'api.test.in',
                  output: 'api.test',
                  configuration: conf,
-                 install_dir: testdatadir)
+                 install_dir: installed_test_datadir)
 endif
 

diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index 55dab8d72df0150382d237723e0f5809374fd89e..e0f63b75d5cf11d513a474149317530a88442a5a 100644 (file)
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -1,7 +1,4 @@
-gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
-testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4')
-testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/nodes')
-
+testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
 test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
@@ -71,7 +68,7 @@ if get_option('install-tests')
   configure_file(input: 'test-css-nodes.test.in',
                  output: 'test-css-nodes.test',
                  configuration: conf,
-                 install_dir: testdatadir)
+                 install_dir: installed_test_datadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in
index 98c1cc1962ac6fc08f15a3ef8a35896bdab1e639..1687ba2dbfc8a9d546efc4de9a29c89745a6bc83 100644 (file)
--- a/testsuite/css/nodes/test-css-nodes.test.in
+++ b/testsuite/css/nodes/test-css-nodes.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes --tap"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/nodes && @libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap"
 Type=session
 Output=TAP

diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index 7163686f09becaeb4c2f807f200a7e5efa5ebc96..ef953f999a4dbea253a9ce0c6fafaf704a91ac8e 100644 (file)
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -1,6 +1,4 @@
-gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
-testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4')
-testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/parser')
+testexecdir = join_paths(installed_test_bindir, 'css', 'parser')
 
 test_parser = executable('test-css-parser', 'test-css-parser.c',
                         install: get_option('install-tests'),
@@ -457,7 +455,7 @@ if get_option('install-tests')
   configure_file(input: 'test-css-parser.test.in',
                  output: 'test-css-parser.test',
                  configuration: conf,
-                 install_dir: testdatadir)
+                 install_dir: installed_test_datadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 132944d10d84b141c120a9ca44641070b05f5d8d..9f36f2a00596f756597bd323e43faed1c863be52 100644 (file)
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser --tap"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/parser && @libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap"
 Type=session
 Output=TAP

diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 6ef4b989605bd65b1a4d3761e12e078e6f316698..0554aad1d5f83949929b681b0b312fa6d450288f 100644 (file)
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -1,6 +1,4 @@
-gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
-testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4')
-testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/style')
+testexecdir = join_paths(installed_test_bindir, 'css', 'style')
 
 cssresources = gnome.compile_resources(
   'cssresources',
@@ -52,7 +50,7 @@ if get_option('install-tests')
   configure_file(input: 'test-css-style.test.in',
                  output: 'test-css-style.test',
                  configuration: conf,
-                 install_dir: testdatadir)
+                 install_dir: installed_test_datadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in
index c36aa00635b0812a51a11d572171b9763ea9ec9c..daeb3641cbd72a927bad5cc50ad2083d392224ba 100644 (file)
--- a/testsuite/css/style/test-css-style.test.in
+++ b/testsuite/css/style/test-css-style.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style --tap"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/style && @libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap"
 Type=session
 Output=TAP

diff --git a/testsuite/meson.build b/testsuite/meson.build
index f2bba2b42448eb0c17682e7427a036da7441d7de..f9b97da5868dc704ad303980a8c315baa079db58 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -1,5 +1,6 @@
-installed_test_bindir = join_paths(get_option('libexecdir'), 'installed-tests', 'gtk-4.0')
-installed_test_datadir = join_paths(get_option('datadir'), 'installed-tests', 'gtk-4.0')
+gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
+installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk-4.0')
+installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk-4.0')
 
 installed_test_env = [
   'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),